From c9cf312cdd50bfe8c91a538111de0b3e8508d800 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 4 Aug 2004 05:38:58 +0000 Subject: [PATCH] s/childs/children/g. Wed Aug 4 01:37:57 2004 Matthias Clasen * gtk/gtktreeview.c: * gtk/gtktreestore.c: * gtk/gtktreemodelfilter.c: * gtk/gtknotebook.c: s/childs/children/g. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtknotebook.c | 8 ++++---- gtk/gtktreemodelfilter.c | 30 +++++++++++++++--------------- gtk/gtktreestore.c | 4 ++-- gtk/gtktreeview.c | 2 +- 8 files changed, 50 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fec678b1c..4dcbd13ee1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Aug 4 01:37:57 2004 Matthias Clasen + + * gtk/gtktreeview.c: + * gtk/gtktreestore.c: + * gtk/gtktreemodelfilter.c: + * gtk/gtknotebook.c: s/childs/children/g. + Wed Aug 4 01:04:48 2004 Matthias Clasen Fix #133446, noticed by Christian Persch: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6fec678b1c..4dcbd13ee1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Aug 4 01:37:57 2004 Matthias Clasen + + * gtk/gtktreeview.c: + * gtk/gtktreestore.c: + * gtk/gtktreemodelfilter.c: + * gtk/gtknotebook.c: s/childs/children/g. + Wed Aug 4 01:04:48 2004 Matthias Clasen Fix #133446, noticed by Christian Persch: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6fec678b1c..4dcbd13ee1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Aug 4 01:37:57 2004 Matthias Clasen + + * gtk/gtktreeview.c: + * gtk/gtktreestore.c: + * gtk/gtktreemodelfilter.c: + * gtk/gtknotebook.c: s/childs/children/g. + Wed Aug 4 01:04:48 2004 Matthias Clasen Fix #133446, noticed by Christian Persch: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6fec678b1c..4dcbd13ee1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Aug 4 01:37:57 2004 Matthias Clasen + + * gtk/gtktreeview.c: + * gtk/gtktreestore.c: + * gtk/gtktreemodelfilter.c: + * gtk/gtknotebook.c: s/childs/children/g. + Wed Aug 4 01:04:48 2004 Matthias Clasen Fix #133446, noticed by Christian Persch: diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 88d6091042..4630238c69 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -478,14 +478,14 @@ gtk_notebook_class_init (GtkNotebookClass *class) CHILD_PROP_TAB_LABEL, g_param_spec_string ("tab_label", P_("Tab label"), - P_("The string displayed on the childs tab label"), + P_("The string displayed on the child's tab label"), NULL, G_PARAM_READWRITE)); gtk_container_class_install_child_property (container_class, CHILD_PROP_MENU_LABEL, g_param_spec_string ("menu_label", P_("Menu label"), - P_("The string displayed in the childs menu entry"), + P_("The string displayed in the child's menu entry"), NULL, G_PARAM_READWRITE)); gtk_container_class_install_child_property (container_class, @@ -499,14 +499,14 @@ gtk_notebook_class_init (GtkNotebookClass *class) CHILD_PROP_TAB_EXPAND, g_param_spec_boolean ("tab_expand", P_("Tab expand"), - P_("Whether to expand the childs tab or not"), + P_("Whether to expand the child's tab or not"), TRUE, G_PARAM_READWRITE)); gtk_container_class_install_child_property (container_class, CHILD_PROP_TAB_FILL, g_param_spec_boolean ("tab_fill", P_("Tab fill"), - P_("Whether the childs tab should fill the allocated area or not"), + P_("Whether the child's tab should fill the allocated area or not"), TRUE, G_PARAM_READWRITE)); gtk_container_class_install_child_property (container_class, diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index e0e4752389..dbbaed794c 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -224,7 +224,7 @@ static void gtk_tree_model_filter_set_root (GtkTr static GtkTreePath *gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filter, GtkTreePath *child_path, gboolean build_levels, - gboolean fetch_childs); + gboolean fetch_children); static FilterElt *gtk_tree_model_filter_fetch_child (GtkTreeModelFilter *filter, FilterLevel *level, @@ -233,7 +233,7 @@ static FilterElt *gtk_tree_model_filter_fetch_child (GtkTr static void gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter, GtkTreeIter *iter, gboolean emit_signal); -static void gtk_tree_model_filter_update_childs (GtkTreeModelFilter *filter, +static void gtk_tree_model_filter_update_children (GtkTreeModelFilter *filter, FilterLevel *level, FilterElt *elt); static FilterElt *bsearch_elt_with_offset (GArray *array, @@ -938,9 +938,9 @@ emit_has_child_toggled: } static void -gtk_tree_model_filter_update_childs (GtkTreeModelFilter *filter, - FilterLevel *level, - FilterElt *elt) +gtk_tree_model_filter_update_children (GtkTreeModelFilter *filter, + FilterLevel *level, + FilterElt *elt) { GtkTreeIter c_iter; GtkTreeIter iter; @@ -1026,7 +1026,7 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model, { GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data); GtkTreeIter iter; - GtkTreeIter childs; + GtkTreeIter children; GtkTreeIter real_c_iter; GtkTreePath *path = NULL; @@ -1101,9 +1101,9 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model, level = FILTER_LEVEL (iter.user_data); elt = FILTER_ELT (iter.user_data2); - /* and update the childs */ - if (gtk_tree_model_iter_children (c_model, &childs, &real_c_iter)) - gtk_tree_model_filter_update_childs (filter, level, elt); + /* and update the children */ + if (gtk_tree_model_iter_children (c_model, &children, &real_c_iter)) + gtk_tree_model_filter_update_children (filter, level, elt); goto done; } @@ -1153,8 +1153,8 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model, /* update stamp */ gtk_tree_model_row_inserted (GTK_TREE_MODEL (filter), path, &iter); - if (gtk_tree_model_iter_children (c_model, &childs, c_iter)) - gtk_tree_model_filter_update_childs (filter, level, elt); + if (gtk_tree_model_iter_children (c_model, &children, c_iter)) + gtk_tree_model_filter_update_children (filter, level, elt); done: if (path) @@ -1330,7 +1330,7 @@ gtk_tree_model_filter_row_inserted (GtkTreeModel *c_model, filter->priv->root_level_visible++; } - /* another iteration to update the references of childs to parents. */ + /* another iteration to update the references of children to parents. */ for (i = 0; i < level->array->len; i++) { FilterElt *e = &g_array_index (level->array, FilterElt, i); @@ -2635,7 +2635,7 @@ static GtkTreePath * gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filter, GtkTreePath *child_path, gboolean build_levels, - gboolean fetch_childs) + gboolean fetch_children) { gint *child_indices; GtkTreePath *retval; @@ -2686,7 +2686,7 @@ gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filte found_child = TRUE; } - if (!found_child && fetch_childs) + if (!found_child && fetch_children) { tmp = gtk_tree_model_filter_fetch_child (filter, level, child_indices[i], @@ -2707,7 +2707,7 @@ gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filte level = tmp->children; found_child = TRUE; } - else if (!found_child && !fetch_childs) + else if (!found_child && !fetch_children) { /* no path */ gtk_tree_path_free (real_path); diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index d59c97b58a..b8ed4fccad 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -2170,7 +2170,7 @@ gtk_tree_store_move (GtkTreeStore *tree_store, if (gtk_tree_path_get_depth (path) != gtk_tree_path_get_depth (pos_path)) { - g_warning ("Given childs are not in the same level\n"); + g_warning ("Given children are not in the same level\n"); goto free_paths_and_out; } @@ -2182,7 +2182,7 @@ gtk_tree_store_move (GtkTreeStore *tree_store, if (gtk_tree_path_get_depth (path) > 0 && gtk_tree_path_compare (path, tmppath)) { - g_warning ("Given childs are not in the same level\n"); + g_warning ("Given children are not in the same level\n"); gtk_tree_path_free (tmppath); goto free_paths_and_out; diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 57ec3da45b..5b068571d0 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -2026,7 +2026,7 @@ gtk_tree_view_size_allocate (GtkWidget *widget, GtkTreeViewChild *child = tmp_list->data; tmp_list = tmp_list->next; - /* totally ignore our childs requisition */ + /* totally ignore our child's requisition */ allocation.x = child->x; allocation.y = child->y; allocation.width = child->width; -- 2.30.2